Autogenerated HTML docs for v1.6.5.2-215-g77097f
diff --git a/git-reset.txt b/git-reset.txt index 469cf6d..2d27e40 100644 --- a/git-reset.txt +++ b/git-reset.txt
@@ -150,7 +150,7 @@ $ git reset --hard <2> $ git pull . topic/branch <3> Updating from 41223... to 13134... -Fast forward +Fast-forward $ git reset --hard ORIG_HEAD <4> ------------ + @@ -161,7 +161,7 @@ which is a synonym for "git reset --hard HEAD" clears the mess from the index file and the working tree. <3> Merge a topic branch into the current branch, which resulted -in a fast forward. +in a fast-forward. <4> But you decided that the topic branch is not ready for public consumption yet. "pull" or "merge" always leaves the original tip of the current branch in ORIG_HEAD, so resetting hard to it
